Fix #412, updating PSP to use new versioning system. #422

dzbaker · 2023-12-27T15:02:47Z

Checklist (Please check before submitting)

I reviewed the Contributing Guide.
I signed and emailed the appropriate Contributor License Agreement to [email protected] and copied [email protected].
Checklist (Please check before submitting)

Describe the contribution
Fixes #412.

Testing performed
Workflows were run.

Expected behavior changes
No behavior changes, however the following changes were made to the versioning system:

Build Baseline is set to "equuleus-rc1"
Mission Revision is set to to 00
"CFE_PSP_BUILD_DEV_CYCLE" macro has been defined
Version String has been removed, and all references to it replaced with the Build Baseline/Codename

System(s) tested on
Ubuntu 20.04

Contributor Info - All information REQUIRED for consideration of pull request
Dylan Z. Baker/NASA GSFC

fsw/shared/src/cfe_psp_version.c

*Combines:* sample_app equuleus-rc1+dev36 sch_lab equuleus-rc1+dev29 to_lab equuleus-rc1+dev38 sample_lib equuleus-rc1+dev2 tblCRCTool equuleus-rc1+dev2 cFS-GroundSystem equuleus-rc1+dev2 elf2cfetbl equuleus-rc1+dev10 cFE equuleus-rc1+dev75 PSP equuleus-rc1+dev38 osal equuleus-rc1+dev33 **Includes:** *sample_app* - nasa/sample_app#226 *sch_lab* - nasa/sch_lab#161 *to_lab* - nasa/sch_lab#186 *sample_lib* - nasa/sample_lib#96 *tblCRCTool* - nasa/tblCRCTool#80 *cFS-GroundSystem* - nasa/cFS-GroundSystem#239 *elf2cfetbl* - nasa/elf2cfetbl#144 - nasa/elf2cfetbl#143 *cFE* - nasa/cFE#2463 - nasa/cFE#2486 - nasa/cFE#2485 - nasa/cFE#2489 *PSP* - nasa/PSP#422 - nasa/PSP#427 *osal* - nasa/osal#1437 - nasa/osal#1442 Co-authored by: Joseph Hickey <[email protected]> Co-authored by: Dylan Baker <[email protected]>

github-advanced-security bot found potential problems Dec 27, 2023

View reviewed changes

fsw/shared/src/cfe_psp_version.c Fixed Show fixed Hide fixed

fsw/shared/src/cfe_psp_version.c Fixed Show fixed Hide fixed

dzbaker force-pushed the fix-412 branch 2 times, most recently from 52e087f to b9f1a09 Compare December 27, 2023 15:13

github-advanced-security bot found potential problems Dec 27, 2023

View reviewed changes

fsw/shared/src/cfe_psp_version.c Fixed Show fixed Hide fixed

fsw/shared/src/cfe_psp_version.c Fixed Show fixed Hide fixed

dzbaker force-pushed the fix-412 branch 2 times, most recently from 0497e02 to 59f6744 Compare December 27, 2023 15:20

dzbaker added the CCB: Provisionally-Approved label Jan 11, 2024

Fix nasa#412, updating PSP to use new versioning system.

12cf76e

dzbaker force-pushed the fix-412 branch from 59f6744 to 12cf76e Compare January 17, 2024 13:53

Merge branch 'main' into fix-412

0b30608

dzbaker added CCB:Approved Indicates Approval by CCB and removed CCB: Provisionally-Approved labels Jan 17, 2024

dzbaker mentioned this pull request Jan 17, 2024

PSP Integration candidate: Equuleus-rc1+dev1 #428

Merged

2 tasks

dzbaker mentioned this pull request Jan 17, 2024

IC: equuleus-rc1+dev1 nasa/cFS#731

Merged

2 tasks

dzbaker merged commit c08b617 into nasa:main Jan 18, 2024
10 of 11 checks passed

Provide feedback